Skip to content

[RLC-10] Rebase Custom Changes to rlc-10/6.12.0-124.21.1.el10_1 #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
roxanan1996 wants to merge 1 commit into
base: rlc-10/6.12.0-124.21.1.el10_1
Choose a base branch
from
Open

[RLC-10] Rebase Custom Changes to rlc-10/6.12.0-124.21.1.el10_1 #787

roxanan1996 wants to merge 1 commit into from

Conversation

@roxanan1996
Copy link
Contributor

@roxanan1996 roxanan1996 commented Dec 22, 2025 •
edited
Loading

https://ciqinc.atlassian.net/browse/KERNEL-387

Update process (This kernel CentOS base for 6.12.0-124)

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create rlc-10/6.12.0-124.X.1.el10_1 branch
  • Check if any maintained code is included in the new el release.
  • Cherry-pick all code from previous branch into new branch (skipping unneeded code)
    • Fix conflicts as they arise
  • Build and Test

Rebuild Log

❯ python3 rolling-release-update.py --repo ../kernel-src-tree/ --new-base-branch rocky10_1 --old-rolling-branch rlc-10/6.12.0-124.20.1.el10_1 --interactive
[rolling release update] Rolling Product:  rlc-10
[rolling release update] Checking out branch:  rlc-10/6.12.0-124.20.1.el10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 3 RESF kernel tags
[rolling release update] Checking out branch:  rocky10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 4 RESF kernel tags
[rolling release update] Common tag sha:  b'9d275943aea76'
"9d275943aea76ee879717ddb876c51b8f57718b7 Rebuild rocky10_1 with kernel-6.12.0-124.20.1.el10_1"
[rolling release update] Checking out old rolling branch:  rlc-10/6.12.0-124.20.1.el10_1
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Getting SHAS 9d275943aea76..HEAD
Already on 'rlc-10/6.12.0-124.20.1.el10_1'
[rolling release update] Last RESF tag sha:  b'9d275943aea76'
[rolling release update] Total commits in old branch: 2
[rolling release update] Checking out new base branch:  rocky10_1
[rolling release update] Finding the kernel version for the new rolling release
[rolling release update] New Branch to create: rlc-10/6.12.0-124.21.1.el10_1
[rolling release update] Creating new branch: rlc-10/6.12.0-124.21.1.el10_1
[rolling release update] Creating new branch for PR:  rnicolescu_rlc-10/6.12.0-124.21.1.el10_1
[rolling release update] Creating Map of all new commits from last rolling release fork
Already on 'rnicolescu_rlc-10/6.12.0-124.21.1.el10_1'
[rolling release update] Total commits in new branch: 4
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
- CIQ Commit 3eb2ba92acdd already present in new base branch: 3eb2ba92acdd54ab858684e77a35a6238b09cf0e github actions: Add build checks for Rocky10 on supported Architectures
[rolling release update] Found 1 duplicate commits to remove
[rolling release update] Removing duplicate commits:
  - 3eb2ba92acdd54ab858684e77a35a6238b09cf0e github actions: Add build checks for Rocky10 on supported Architectures
[rolling release update] Applying 1 remaining commits to the new branch
  [1/1] 41b67acf4187f tools: hv: Enable debug logs for hv_kvp_daemon
[rolling release update] Successfully applied all 1 commits

Build

> grep -E -B 5 -A 5 '\[TIMER\]|^Starting Build' /home/rnicolescu/ciq/kernels/rlc-10-copy/kernel-build-after.log
/home/rnicolescu/ciq/kernels/rlc-10-copy/kernel-src-tree
Running make mrproper...
[TIMER]{MRPROPER}: 6s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3"
Making olddefconfig
--
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  GEN     arch/x86/include/generated/asm/orc_hash.h
  WRAP    arch/x86/include/generated/uapi/asm/bpf_perf_event.h
  WRAP    arch/x86/include/generated/uapi/asm/ioctl.h
  WRAP    arch/x86/include/generated/uapi/asm/fcntl.h
  WRAP    arch/x86/include/generated/uapi/asm/ioctls.h
--
  LD [M]  net/qrtr/qrtr-mhi.ko
  LD [M]  virt/lib/irqbypass.ko
  BTF [M] net/qrtr/qrtr-mhi.ko
  BTF [M] net/qrtr/qrtr.ko
  BTF [M] virt/lib/irqbypass.ko
[TIMER]{BUILD}: 2497s
Making Modules
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/modules.order
  SYMLINK /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/build
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/modules.builtin
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/modules.builtin.modinfo
--
  STRIP   /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/kernel/net/qrtr/qrtr-mhi.ko
  STRIP   /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+/kernel/net/qrtr/qrtr-mhi.ko
  DEPMOD  /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+
[TIMER]{MODULES}: 23s
Making Install
  INSTALL /boot
sed: can't read /home/rnicolescu/ciq/kernels/rlc-10-copy/kernel-src-tree/arch/x86/boot/.bzImage.hmac: No such file or directory
Can't create '/boot/.vmlinuz-0-rescue-2adeea37d6d145f09ba612fce6891624.hmac' from '/home/rnicolescu/ciq/kernels/rlc-10-copy/kernel-src-tree/arch/x86/boot/.bzImage.hmac'!
kdump: For kernel=/boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+, crashkernel=2G-64G:256M,64G-:512M now. Please reboot the system for the change to take effect. Note if you don't want kdump-utils to manage the crashkernel kernel parameter, please set auto_reset_crashkernel=no in /etc/kdump.conf.
[TIMER]{INSTALL}: 59s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+ and Index to 2
The default is /boot/loader/entries/2adeea37d6d145f09ba612fce6891624-6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+.conf with index 2 and kernel /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+
The default is /boot/loader/entries/2adeea37d6d145f09ba612fce6891624-6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+.conf with index 2 and kernel /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.21.1.el10_1-8aedc60554f3+
Generating grub configuration file ...
Adding boot menu entry for UEFI Firmware Settings ...
done
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 6s
[TIMER]{BUILD}: 2497s
[TIMER]{MODULES}: 23s
[TIMER]{INSTALL}: 59s
[TIMER]{TOTAL} 2591s
Rebooting in 10 seconds

Kselftests

WIP

@PlaidCat @roxanan1996
tools: hv: Enable debug logs for hv_kvp_daemon
f7f09e0 
jira LE-3207
feature tools_hv
commit-author Shradha Gupta <shradhagupta@linux.microsoft.com>
commit a9c0b33

Allow the KVP daemon to log the KVP updates triggered in the VM
with a new debug flag(-d).
When the daemon is started with this flag, it logs updates and debug
information in syslog with loglevel LOG_DEBUG. This information comes
in handy for debugging issues where the key-value pairs for certain
pools show mismatch/incorrect values.
The distro-vendors can further consume these changes and modify the
respective service files to redirect the logs to specific files as
needed.

	Signed-off-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
	Reviewed-by: Naman Jain <namjain@linux.microsoft.com>
	Reviewed-by: Dexuan Cui <decui@microsoft.com>
Link: https://lore.kernel.org/r/1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com
	Signed-off-by: Wei Liu <wei.liu@kernel.org>
Message-ID: <1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com>
(cherry picked from commit a9c0b33)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@roxanan1996 @PlaidCat